Merge from origin/emacs-28

0591aa6cd3 Revert an erroneous change in tramp-cache.el

diff --cc lisp/net/tramp-cache.el
index 1ab8f4d335b00e7bf81ac7f09e24a3c5e8e38b67,d35f7ffa4e311c243f7938a96a677b18f65b9413..dc1e3d28b582528c96561a971febb6e6f2f005a6
--- 1/lisp/net/tramp-cache.el
--- 2/lisp/net/tramp-cache.el
+++ b/lisp/net/tramp-cache.el
@@@ -122,9 -125,9 +122,9 @@@ If KEY is `tramp-cache-undefined', don'
               (puthash key (make-hash-table :test #'equal) tramp-cache-data)))
          (when (tramp-file-name-p key)
            (dolist (elt tramp-connection-properties)
-             (when (tramp-compat-string-search
+             (when (string-match-p
                     (or (nth 0 elt) "")
 -                   (tramp-make-tramp-file-name key 'noloc 'nohop))
 +                   (tramp-make-tramp-file-name key 'noloc))
                (tramp-set-connection-property key (nth 1 elt) (nth 2 elt)))))
          hash))))